Merge "Fix static lib collision between system_server + framework"