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

Change-Id: I06fa3b87358d4f381b132ac47a821ddad74b3bd4