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

Change-Id: Iebdc04b6d38830c77f0b3e493b0a7f2487329804