am: 2021702d * commit '2021702d': Workaround for apps using a copy of libnativehelper Change-Id: Ib2aad8fbb5b1b844e273e08b806b046513301687