DO NOT MERGE ANYWHERE import sdk from nyc-mr1-dev build 2851552

nyc-mr1-dev's prebuilt support is quite old
This fixes some build issues.

Change-Id: I809c68d581d97f52530a111d3584517bfe7c9b46
294 files changed