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

Change-Id: Ib61cb192c4e0ec8c06261575d64745a5cdb1f406