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

Change-Id: I21fb4641dd250680de5a97d7d9fc97e01d93565d