Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am: 837b86aa56 am: 61e811370d" into nyc-mr1-dev-plus-aosp
am: 5a80c62e43

* commit '5a80c62e436750050b97337f27f5aced2055abea':

Change-Id: Ic9afd84ae0265ae04fdcd8dc061e5fc71a805285