TODO: Cleanup will follow. Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
Change-Id: If7015f2fa5932f69807797ffcc496550d5cb1630
Move java code to a different directory so that the unbundled version doesn't try to compile the native code again. Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986