Merge "Update sample prebuilts for 2017-08 samples release am: 56ae2608f9 am: 7a6b9aabae am: c7906ddde6" into oc-mr1-dev-plus-aosp