Replace recursive directory processing with chown

Closes-Bug: 1255412
Change-Id: I45247b37cb499a52b8bfc53d5a57600cf524056e
Merge "Replace recursive directory processing with chown"