Merge "libnativehelper: add dummy Android.bp file"