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

Change-Id: Ia675a65eef5d05360ffbe9a43df0873f2009af75