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