[automerger skipped] Merge "Don't specify sdk_version for stubs" am:...
[automerger skipped] Merge "Don't specify sdk_version for stubs" am: 8337e654 am: 41113882 -s ours
am skip reason: Change-Id Ibc2a1af60f10dd5d270e502011a70e20e7ed934a with SHA-1 fde19f0a is in history
Change-Id: Ic3a706561145fb2308159e802a5c824a870a730b