Merge commit '5cdd7858' into froyo-plus-aosp * commit '5cdd7858': Fix issue #2553553: API REVIEW: android.context.Context