am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.

Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.