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

Change-Id: I9ed08f4fbedbbcbdb3c7af6e2676bfdbd447888c