Merge "Add support for RPMB over VirtIO Serial" am: 2ba61b775a
am: 7e683ff9e4

Change-Id: Ifa52f325897bb2d9f522d07613ed80e619245c94