base: Fix strings, the order was inverted :)

Change-Id: I21228815b281ca3e359bfbc06737a69155b37d3b
Merge remote branch 'omni/android-4.4' into android-4.4