Merge "Address review comments in aosp/2677976" into main
tree: 3b6dde66c7515e8c3331590aa17268bba7cb21f6
  1. staticlibs/