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

Change-Id: Idecdefd6e64c44e7496d17cad5d76113799df874