Merge "Clockwork: add feature android.software.input_methods" into oc-dev am: eed865e61b
am: 73931bf207

Change-Id: Iabce8207d6ef63f2097c9a18fbafe26b85473f99