Merge \\"libnativehelper: convert Android.mk to Android.bp\\" am: c68f97d411
am: 4f40139257

Change-Id: I833916cca39d4a5705a199441ed4aa5cc27fc9b0