Merge "Include v4, use AAPT2" into oc-dev