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

* commit '6b501251111559585b08f1c6641ffec39a96699d':
  ART: Fix Trace types, check minimum buf size