Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401" into nyc-dev