[2/2] Base: Swap volume buttons when the screen is rotated

Change-Id: Ifa59933feaad5f91c8b4e1fa7db98da72dc7e80d
base: Keyguard: correct usage of lock delay on end call

http://jira.omnirom.org/browse/OMNI-793

Change-Id: I32222a62bec05c4c99ac3039bf7aa983fccb6020
Merge pull request #24 from omnirom/android-4.4

同步自 omnirom android-4.4