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

Change-Id: Icc8b9c4454880720f897628e78271ba168a79a5e