Merge "Merge "Update sample prebuilts for 2017-08 samples release am: 56ae2608f9 am: 6bdfd2ca23" into oc-dr1-dev-plus-aosp am: 53092eae9e" into oc-mr1-dev-plus-aosp