Merge "atrace: add priority inheritance trace point" into pi-dev