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

Change-Id: Ie0038ce588a93b4844d9bc47a3bea7ee94d4b49b