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