Merge "Update escaping in Android.bp files" am: d655f577be
am: 0795213c78

Change-Id: I57bc0bac3df0b51d810fa204a7ff8b23361545d2