Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-plus-aosp * commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942': fix build breakage
Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-plus-aosp * commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942': fix build breakage