Merge "Aapt2 ValueTransformer" into sc-dev