Merge "Put sdk_version in module stub defaults" am: 4ad8c6fb95

Change-Id: Iaad776432fe50cd20a51be8646c35040058bde41