am 5b5bd419: am 6b501251: am 2c31b5ac: Merge "ART: Fix Trace types, check minimum buf size"

* commit '5b5bd4199bc77be99f06904c31cde331378b6679':
  ART: Fix Trace types, check minimum buf size