Merge "Merge "Add Mainline Test Suite (MTS) to build." into qt-dev am:...
Merge "Merge "Add Mainline Test Suite (MTS) to build." into qt-dev am: 3538cebf am: 450cfe25" into qt-r1-dev-plus-aosp
am: f7c8205a
Change-Id: Id5465b8d09480c9f3f9609daea3cf700bbe527a3