am fc24dc1a: am 787c0d04: merge in klp-release (no-op)

* commit 'fc24dc1a':
  Camera: Skip AE precapture when possible
  Cleanup openRecord error handling
  TimedEventQueue takes a wake lock
  fix offload audio effect proxy implementation uuid
  MediaCodecInfo: report supported color formats for non-native-window mode
  Camera2 API: Hack: Always use async mode with GLConsumer
  AudioTrack: fix music resume