Merge "Update for new Android Verified Boot (AVB)."
am: 8ee6d119d1

Change-Id: I4445455b1b16c6c920c39d7a1d66520eeda385cf