am bf7afa23: am 94f55b30: Merge "Tracking libnativehelper dependencies"

* commit 'bf7afa239e9541b3cac5a3c510bfb9b25b4a1348':
  Tracking libnativehelper dependencies