Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev
am: f28901f6c5

Change-Id: I855fec4f3cf126485999a008cec9648967cbf21f