Merge "DO NOT MERGE: Fixed broken aapt2 tests" into qt-dev
am: cbe933a40f

Change-Id: Ic0da145919936b8427ba9c6504606f1708832631