Merge "Move virtualization-specific proto definition to /device/google/trout"...
Merge "Move virtualization-specific proto definition to /device/google/trout" into rvc-dev am: b82cdd09 am: eb649c6f
Change-Id: I23d43ab6b7db16c51903b1a380e37212e90d5113