Change-Id: I80db4a52f5bbb25c77dfe7df94bdced69debf831
Change-Id: If1bf7d20e4f8a47a7c0429d2445431dc73c1b31b
Move java code to a different directory so that the unbundled version doesn't try to compile the native code again. Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986