Merge "Remove global JniConstants.h header." am: 18c5869f am: a8b15a4c am: 3dc69f5d am: 9c12241c am: c327f0c0 Change-Id: Ie8edf9ae6a828a24dfbbeb2cc3c2f9f67b4dc048