Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp * commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9': Add locking around ZIP seeking
Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp * commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9': Add locking around ZIP seeking