Merge "drmserver: audit permissions for /data/app"