Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp * commit '583fefc8dcadecc7fc933513d3569dd9c16c100c': Use the context_priority extension when present.