Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp * commit '62335430b05d92ad2255bf20b76b35e012b385c9': Fix bad merge fixes build breakage.
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp * commit '62335430b05d92ad2255bf20b76b35e012b385c9': Fix bad merge fixes build breakage.