Merge the android-9.0.0_r60 release tag
Android 9.0.0 release 60

* tag 'android-9.0.0_r60':
  ANDROID: Fix heap overflow in sgdisk

Change-Id: I249c0e08054471eda63b47e3e42c78848d1479ed