Update Sunfish SVN to 15 am: 60869c86b8

Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/12617774

Change-Id: I2af7e950a7bb3e01e61dfeb1bac4b0e6cf3100f3