Merge commit '6938bb36b8992420ec5cb392706a8bc192b332c1' into eclair-plus-aosp * commit '6938bb36b8992420ec5cb392706a8bc192b332c1': Fixing the broken build