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

Change-Id: I688c7acf8fe1807f8f77f06f3324b37900837a78