Revert "Revert layer proto format back to proto2"

This reverts commit 5dad909092932dc5c02d1be2f6ece1a3d06908ad.

Reason for revert: 298512106

Change-Id: I6c371f9958b2112f51ba801131ee912dff5a4da7
2 files changed