Merge "atrace: add priority inheritance trace point" into pi-dev am: 7dbedde3d3
am: 876fa93349

Change-Id: I55a3da156a351753ea93eb61dd8fa920948a5678