Merge "Convert external/antlr-runtime to Android.bp" am: affde7a659
am: 60c229122e

Change-Id: I3e53058391674a99809b94e08935036973684318