Merge "Skip ab/6749736 in stage." into stage-aosp-master
tree: 6bc0f474699f7c587459352fe399bc535bed3848
  1. staticlibs/