am 488eddca: Merge "Update lockscreen assets" into ics-mr0

* commit '488eddca0f1b2fd824de52e0f38c90b2d129d3b0':
  Update lockscreen assets