Merge "Update prebuilts for 2017-10 Samples release am: f1a589f1cc am: 8d769c3676 am: ff03bd04a4" into oc-mr1-dev-plus-aosp
am: 9898d0806d

Change-Id: I6b69e4872a57ee8e065bbaab511d127ac1925581