Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread