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

Change-Id: I31314875e1646a0624ddbd91eba5727cbb94cdaa