Merge changes I9f05aff3,Ia9f3f221

* changes:
  gn2bp Remove API helpers from cronet_aml_api_sources
  gn2bp: Add framework-annotations-lib to cronet_aml_api_java