Merge "Copy verified_boot.xml unconditionally." am: 6194be0ff3
am: 67e78c0131

Change-Id: Ibaf8a3d5dfae0a3bc326bc813efa3dc580c6f15e