Merge "Use Android.mk to specify private symbol package name"