Merge "Remove global JniConstants.h header."
am: 18c5869ffc

Change-Id: I77e48898bf48b293e1213a6af780c283ae45a600