am 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.

Merge commit '12ed1a7d9a72fa16cb677027e1cea65206550a22' into eclair-mr2-plus-aosp

* commit '12ed1a7d9a72fa16cb677027e1cea65206550a22':
  SDK Manager support for future schemas.