InCallUI: Fix landscape layout

- http://review.cyanogenmod.org/65024 missed to do the button change
  also in landscape layout file, causing crash in landscape. Fixed.
- landscape layout updated according to the last 'qcril' merge
  (button order changed)

Change-Id: Ib75c7be432cc0f8ffc28c37d071ae18838cea26d
Merge "InCallUI: Fix landscape layout" into cm-11.0
InCallUI: Improve latest CAF strings

Change-Id: If40628775393ab6e6fed6f92f8dbc2797c2b9f9f
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0