Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am: 837b86aa56

* commit '837b86aa5696fea28a0acfde7361a3c5d5824624':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e