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