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