Merge "Retire convenience macros from JNIHelp.h" am: 122db09d49 am: 1f2a7603af am: 6ce52c2d09
am: 721695a8ba

Change-Id: I3967d8106356f8453e2826bf1af9e69219e0d705