Merge "update library name, just for Android.mk." into mnc-ub-dev