Merge "Clean up prebuilts update script am: 13401d35fc am: e0994386f3" into oc-dr1-dev-plus-aosp
am: a0eda768fe

Change-Id: Ia77b92bcd589ecca429b0fceac22091d58294c6f