Merge "Update sample prebults for 2017-02 release (nyc-mr1-dev) am: a9a842cf61 am: 2618149702 am: 38ff69ce53" into nyc-mr2-dev-plus-aosp