Merge commit '1ca191c2f7eb2be53d0f96117784ecafd888da73' into eclair-mr2-plus-aosp * commit '1ca191c2f7eb2be53d0f96117784ecafd888da73': Fix issue #2258571: Fix build versions
Merge commit '1ca191c2f7eb2be53d0f96117784ecafd888da73' into eclair-mr2-plus-aosp * commit '1ca191c2f7eb2be53d0f96117784ecafd888da73': Fix issue #2258571: Fix build versions