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

Change-Id: I469048b1d87711b122cfd2a75af38bc35cf3c70c