Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev
am: 86cb762ae6

Change-Id: Id175edab5f98cb062731c7d4064006f56f991a6d