This change also fixes wrong file mode. Change-Id: Ifcf4c9444ddcdc62d2e4b394891d6eee135c1e8f
Change-Id: I62f80b2d6e85ffa7bbf92992fe6942690163ef17
Move java code to a different directory so that the unbundled version doesn't try to compile the native code again. Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986