gn2bp: Refactor and code clean up

Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I20b9d12c0a66555914760a766995629399c76a1c
2 files changed