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

* commit '94ef3e21dbfb5b17c4fa561a0d30bb8df894409d':
  update library name, just for Android.mk.