Merge "Put sdk_version in module stub defaults" into rvc-dev am: 261e944b0f am: ab9aff7260

Change-Id: If054c7ec8e58a7816235f99d70264ed10c56e292