Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp * commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4': Fix simulator build
Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp * commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4': Fix simulator build