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

Change-Id: I8f46daa1e7901181ebc4d8a7edd6ab4a0ff9aee7