Merge "Set libnativeloader style to clang-format-2" am: 23fc5afa2d
am: d6a061baab

Change-Id: I143be51670af0e2ef32ff906b054c38295876109