am: 3c916450 * commit '3c916450': Workaround for apps using a copy of libnativehelper Change-Id: If7a6e083789869b28a94d3534e9feb377f468ad6