Merge "Fix package names and missing assets in android.os" into lmp-dev