Merge changes Ic78f0dee,I845cb7f5,I4d9d81ee,Ibdacb9ee

* changes:
  gn2bp: Fix incorrect aprotoc command
  gn2bp: tweak //tools/grit/grit.py
  gn2bp: Add "android_jar.classes" to jni_generator genrules
  gn2bp: Fix cronet_aml_java srcs path