Merge "Remove incomplete input device enumeration NDK API." into gingerbread