Merge "Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS" am: 2faec12c07 am: 916b368b2f
am: c859b0a6b2

Change-Id: Iff9d32bc9f718879831c1c3d7bbd51e7d8ad591b