Merge "Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf" into oc-dr1-dev
am: 9c2b22c487

Change-Id: I5e076c940ea3b7a09d8f3ed4a6a5b87ce8aa0021