Merge "Update escaping in Android.bp files"