Merge "Moving junit out of core.jar and into core-junit.jar"
am 06df2923: libdrm2 is never used.  Remove the reference to it.
am 876ae91c: am 06df2923: libdrm2 is never used.  Remove the reference to it.
am 105a934f: am 9514fca5: merge from open-source master
am ce88086c: am 105a934f: am 9514fca5: merge from open-source master
am 216d8448: am 95f862bc: merge from open-source master
am da9a8535: am 216d8448: am 95f862bc: merge from open-source master
Allow java source in LOCAL_GENERATED_SOURCE

Change-Id: I82f426f1523f56a87ad396f2d7928b839f7c3ec9
Merge commit 'd15b6972bfc4709b26969198b9d351e21b6ec157' into oxygen_4.3

* commit 'd15b6972bfc4709b26969198b9d351e21b6ec157':
  Allow java source in LOCAL_GENERATED_SOURCE