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