Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am: 837b86aa56 am: 61e811370d" into nyc-mr1-dev-plus-aosp