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

Change-Id: Iab087b54a032c08eb6083dc84e16053ac97d80cf