Merge "Update escaping in Android.bp files" am: 06460bf466 am: 0ea7c975af
am: 7d82c1291c

Change-Id: Ifba84db1d83c3214dd50ac4575c071d0cdbcc252