Merge "Convert external/apache-harmony to Android.bp" am: 41e65bc9a8
am: 88d5daaf4a

Change-Id: I0f7d6ce395297cae7ea241501594d0f2b46bf6f9