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

Change-Id: I2f71c4c0296609caf48aa9a10a05154f5fa952d3