[automerger skipped] Merge "Put sdk_version in module stub defaults" am:...
[automerger skipped] Merge "Put sdk_version in module stub defaults" am: 4ad8c6fb am: d9649970 -s ours
am skip reason: Change-Id I91db06ef932a73002b4fe232566f5d111baef432 with SHA-1 15273536 is in history
Change-Id: I0f24ae0ff4ae26640515bd3fca5764d5974f49a3