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

Change-Id: Id2bef485de9c4bf90e12846cc80a32da109cd26d