Merge changes from topics "2374762-android-bp", "2374763-android-bp"

* changes:
  cronet: sync Android.bp with aosp/2374763
  cronet: sync Android.bp with aosp/2374762