Merge "Fix 3385152: Update lockscreen font." into honeycomb