Merge "AAPT2: Follow symlinks when compiling" into oc-dev