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

Change-Id: I91ae058682dc8bd650f30d060a888cdcb7a4ab40