Merge changes Iafbaee0d,I468d218b

* changes:
  gn2bp: Add min_sdk_version to cronet_aml_java
  gn2bp: Update desc jsons and Android.bp.swp