Merge commit '780211a9a792dcc4cd57df0a4e8da34d05eb99f1' into eclair-mr2-plus-aosp * commit '780211a9a792dcc4cd57df0a4e8da34d05eb99f1': Fixing broken build