Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401\" into nyc-dev
am: 44d50cac49  -s ours

Change-Id: Ie1d90bf2c7e69736a3aa9897adc88ec655ea83eb