Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5
am: 86c4f8ed54

Change-Id: I3fcdd659de74524b694e16581aaeea2d412245e0