Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev