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

* commit '9e03c1b9474084b73c92ebf3c6fa43de8e2fa91c':