Merge "Remove dependency on libnativehelper/JniConstants.h"
am: 7fbba6bbbc

Change-Id: I0f9375b245965ba445edecfa8a42e2cf123eba7c