am 269c64de: Merge "Update lockscreen assets" into ics-mr0

* commit '269c64de8817e158e9ae49ea489344fbfc46f160':
  Update lockscreen assets