Merge "Update checkvintf on build_mixed"
am: 14dd5a85c3

Change-Id: Ibde0c7764488a9de23233bfe249d061d832ef89c