Merge "Updateability: Find alternatives for APIs in android/content"