Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo