Merge changes I949087c6,I3046a3b3 into main

* changes:
  [idmap] Small cleanup in create-multiple
  [aapt2] Small cleanup of utils