am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
tree: ed289e8d756105114a04b35dbef3c027454f49f7
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/