Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp * commit '3bd9b8f04cece37ab4405abc382e2810006b9f97': Fix build breakage.
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp * commit '3bd9b8f04cece37ab4405abc382e2810006b9f97': Fix build breakage.