Merge "Add UiBench jank and macrobench tests for saveLayer performance"