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

* commit '2c31b5ac1d45f2f96932c8ff0d299abb2dbde862':
  ART: Fix Trace types, check minimum buf size