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

Change-Id: Ib8497fe2cb20dd55ec51f5e350575d5b9313d674