Merge "Widen permissions on synthesized files." into ics-mr1