Merge "Build libnativehelper as static library"