Merge "Wrap legacyExtra generation in targetsdk check" into qt-dev
am: 11110b74ac

Change-Id: I5486018118c535c290ce5b895061da2e3a008ced