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

Change-Id: Ic704d134a33bb9cfbda2ae88fce3571bda5176fa