Merge commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0' into gingerbread-plus-aosp * commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0': Remove incomplete input device enumeration NDK API.
Merge commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0' into gingerbread-plus-aosp * commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0': Remove incomplete input device enumeration NDK API.