Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp * commit '4e08a985418f581b4ca8c46316c85defd7b173cd': fix build DO NOT MERGE
Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp * commit '4e08a985418f581b4ca8c46316c85defd7b173cd': fix build DO NOT MERGE