Merge "Update escaping in Android.bp files" am: 1bfae98559 am: 8fce0b19ee am: 8cd8d232d3
am: d1b183b8c2

Change-Id: I1107003c146e023b95e6528b4e3cc1f090a24d0e