Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev