[automerger skipped] Add current frame and barrier layer info to protobuf. am: 9885bd4b3f
am: 34890724dd  -s ours

Change-Id: I2d25b30b38487f31d7157e1764861973c94a4ea5