Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev