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

* commit '3e01b483708d0fc3766fa4adff2ae8b354de75dc':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.