Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp * commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5': Hopefully fix the build.
Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp * commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5': Hopefully fix the build.