Merge "Make update_verifier generic across verified boot versions." am: ea63f59469 am: abcac8e1e7
am: 98de595c59

Change-Id: I1cb26ccef5a1ec911f2edfb33520c8f1d54f3c01