Merge "Update checkvintf on build_mixed" am: 14dd5a85c3
am: d77131065c

Change-Id: Iab11a3695f1f6495f62a62ae09b7e73c9b19f846