Merge commit '72fc14e874b53580420649b547c5fce1a8edc99c' into eclair-mr2-plus-aosp * commit '72fc14e874b53580420649b547c5fce1a8edc99c': fix build breakage
Merge commit '72fc14e874b53580420649b547c5fce1a8edc99c' into eclair-mr2-plus-aosp * commit '72fc14e874b53580420649b547c5fce1a8edc99c': fix build breakage