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

Change-Id: I49a44b99b396efa323185b21e579bb42cf8f9dd0