Merge "libnativehelper: Fix templates for clang-r377782 update." am: e5a25d8f85 am: 59958e97d0 am: 914fac9c1b

Change-Id: Icd7d0a5a459203c4e1fcd9a61a0cb7826e9aa3be