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

Change-Id: Ifc79c77cc83d80fa135128f0283900c6b824fb20