[automerger skipped] Merge "DO NOT MERGE: Fixed broken aapt2 tests" into qt-dev am: cbe933a40f
am: bfdebbbd3d -s ours
am skip reason: subject contains skip directive

Change-Id: I0063c9bb7f77b6ab38b0ae00a1fdf04f6ce00ae1