Merge "Fix package names in android.content" into lmp-dev