Merge "Specify private resource package in Android.mk"