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