Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev