Merge changes I851f9fb9,I60dbcb24 into sc-dev

* changes:
  Refactor aapt2 tests ResourceTable changes
  Prepare aapt2 for multiple ids per type