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

Change-Id: I1df49642d5c7be806c1beb6cec31cc92c48e9458