Merge changes I12a07ba3,I308763fa

* changes:
  gn2bp: Removed meaningless lines
  gn2bp: fix output_dir arg for jni_generator.py