Merge "Assign OWNERS for android/server/resources"