Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp * commit '00e5c61366d3d3d62c259277823ea15a14f68ad4': Improve thread safety of input mappers.
Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp * commit '00e5c61366d3d3d62c259277823ea15a14f68ad4': Improve thread safety of input mappers.