Merge "Nativehelper: Export header-only version of helpers" am: 7678ec555b
am: 6f8f41256d

Change-Id: I1f410bdbedef63328349619d45d62b80640a8260