Merge "Merge "Fix install flag overlap" into qt-dev am: 8b486b7870 am: 0c2d505dfb" into qt-r1-dev-plus-aosp
am: 1d131a8c20
Change-Id: I855dd97b0ca113dc94fc10542a9f32333274d79b
This commit is contained in: