Merge "Mark ab/6881855 as merged" into stage-aosp-master
tree: 12e1a32c68a2ab1d8907c29605464db5dd7ed570
  1. staticlibs/