This change also syncs the drawables with Master.
Cherry-pick: I2573786aac5fd8d543cf12d24c951b67c7353fd7
Bug: 4436327
Change-Id: I88dc0162033a1017040205590c0c34a5111b835a
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.
Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986