Merge "Build libnativehelper_header_only against NDK" am: dc9e306ecd am: bd1e1d398c
am: 235904c83f

Change-Id: Ief1ca478b47a69a23f1afdea39b768614083d776