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