Merge "Allow system_server_startup to load system server odex files"