am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair

Merge commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934' into eclair-mr2-plus-aosp

* commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934':
  Fix issue #2258571: Fix build versions