Merge "Allow system_server to search su:key in debuggable build"