Merge "Update escaping in Android.bp files"
am: 06460bf466

Change-Id: I0f828add8a11160b49866b5784d8615278d4e4a8