Merge "Workaround for apps using a copy of libnativehelper" am: 313768f6 am:...
Merge "Workaround for apps using a copy of libnativehelper" am: 313768f6 am: 2021702d am: e2597aca
am: c0c43b37
* commit 'c0c43b37':
Workaround for apps using a copy of libnativehelper
Change-Id: I95cee481d460d492024eb633f9f14cba899850b4