Merge "Setup new lib name for Android.mk file, update the scaling computation" into mnc-ub-dev