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

Change-Id: I3d7fc1507cde91087181f631ebb39bb448d932d0