am: 458c1f75 * commit '458c1f75': Workaround for apps using a copy of libnativehelper Change-Id: Iebd79a5fbc7e2cc4a50f71ff431c5e3e6437cec0