Merge commit '1778776cf1349a5f275945c53edcd1454d58639c' into eclair-plus-aosp * commit '1778776cf1349a5f275945c53edcd1454d58639c': Fix issue #2258571: Fix build versions