am 94f55b30: Merge "Tracking libnativehelper dependencies"

* commit '94f55b30e3e04dbea63836197e76c7464d8d6d37':
  Tracking libnativehelper dependencies