Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev