am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the...
am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '3e01b483':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.