am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5

Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-plus-aosp

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5