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

* tag 'android-9.0.0_r60':
  clearkey hidl: fix oob read in decrypt
  Fix potential use-after-free issue
  Expand nuplayer mutex for mediametrics management
  m4v_h263: Return error for zero width and height

Change-Id: I8ace7e5581e881756b6845413933740b39588c2d