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

Change-Id: Ia07917cbad3d180abdb8837960f247feaec2b134