Merge "Update sample prebuilts for 2017-08 samples release am: 56ae2608 am: 6bdfd2ca" into oc-dr1-dev-plus-aosp