Merge "Copy NDK libraries and headers from libnativehelper to a new directory that will stay in platform."