Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp * commit '3ecd58c650371206008efd687933c370e4e28a34': Fix build
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp * commit '3ecd58c650371206008efd687933c370e4e28a34': Fix build