[automerger skipped] Merge "DO NOT MERGE: Fix the build_test build" into qt-qpr1-dev-plus-aosp am: b0a70f830e -s ours am skip reason: subject contains skip directive Change-Id: I4622da7642e0aa98c19b615d958b423a54bf7ab9