Merge "Drop build-tools/sysroot symlink." into common-android-mainline
tree: 0d07044ef0ca90e1efaf91dd0d8d6ecddfc21f5b
  1. default.xml