Merge "libnativehelper: remove Android.bp"