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

Change-Id: I2d66796af16c557dd1eb1b831fbab995c291b570