Merge "omx: Update language to comply with Android's inclusive language guidance"