am: 313768f6 * commit '313768f6': Workaround for apps using a copy of libnativehelper Change-Id: I45e67c98df82e7b8365e712ea3759b6e4bb9e179