Merge "aapt updates for Android TV" into lmp-mr1-dev
automerge: 6af7d76

* commit '6af7d76eff60220c5ab3678d8d1fb74ede242ace':
  aapt updates for Android TV