Update oriole SVN to 25 am: 6414ff31c8 am: e14378e4ef

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

Change-Id: Iec59ee1f92799c547c3e8a7190d5b82ab12d04d0