Merge "Update HWC dump format"