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

Change-Id: I2343ab7fcd7cf877e4740b05890074b5b628547b