Merge "Remove dependency on libnativehelper/JniConstants.h"
am: 8d7f7a4ada

Change-Id: Id95ebd8d01039f79ff49db2331dc0b4054169bc4