Merge "surfaceflinger: fix per-frame metadata to be per-layer" into pi-dev
am: 0cab4a5302

Change-Id: I8c73e1db4cf7ee1b822be97733d932d618e51b32