android-942
Review fixes
Put b2 logic back to configure.sh temporary.
[cmake] Fixed build version getting.