Merge "Remove dependency on libnativehelper/JniConstants.h"