Fix wrong translation for phone_hint in Spanish

Google seems to have it fixed on master branch but it is not yet on lollipop one.
This fixes the trouble where the system tells you on the lockscreen to
swipe left for camera and also swipe left for phone
when it should be swipe right for phone.

Change-Id: Ic9bba128e1b617c58c77c60acfdcffc6918da3f8
platform.xml: Fix syntax error

Change-Id: I1c2a5b2cce8deaccf0c5e120cf923723a8f9acfd
Merge branch 'cm' into HEAD