Merge "Version bump to OCR1.201013.002 [core/build_id.mk]" into oreo-cts-release