Merge "Revert "App home directories are now 0700 for targetSdkVersion > 17""