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: 95a080b3
Change-Id: Ib95cb7e171b9231c98ce6c17b11c3e6b68adabf8