Merge "Allow system_server to delete directories in preloads" into nyc-mr1-dev am: 1be3b599 am: a59a44db am: 15e496e2 Change-Id: Ic6853c251c4653d04788099cbadd0e64473ebf2d