Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp * commit '5c43a7af7b9530016b922ddec0401ab9199cd595': When 32-bit offset is used,
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp * commit '5c43a7af7b9530016b922ddec0401ab9199cd595': When 32-bit offset is used,