Merge "Fix build."

Author: Jeff Brown

services/input/tests/InputReader_test.cpp

@@ -171,7 +171,7 @@ class FakeInputReaderPolicy : public InputReaderPolicyInterface {
         mInputDevices = inputDevices;
     }
 
-    virtual sp<KeyCharacterMap> getKeyboardLayout(const String8& inputDeviceDescriptor) {
+    virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor) {
         return NULL;
     }
 };