Merge "overlay: Add more default packages from Google" into android-10