Merge "HWUI: add leak check for macrobench"