Merge "Fix install flag overlap" into qt-dev
am: 8b486b7870

Change-Id: I251488d03299750c6500c67be43f9e78101b1985