Merge "Adds PRODUCT_SHIPPING_API_LEVEL and BOARD_VNDK_VERSION" into oc-mr1-gce-dev