Merge changes I297718dd,I3a2e8a9a

* changes:
  gn2bp: Remove sqlite from net_unittests
  Revert "gn2bp: Convert cc_objects to cc_static_library"