Merge changes Ibf58f981,I2c007222,I23d13c71,I4c1a8be6,I96e4c083, ...

* changes:
  gn2bp: add support for building against Android zlib
  gn2bp: support architecture in builtin_deps
  gn2bp: correctly flatten source_sets under linker unit target
  gn2bp: add is_linker_unit_type helper to Target
  gn2bp: fix include dir denylist
  gn2bp: fix Android.bp.swp