Remove all assumptions around a -uni suffix

Also fixed a few linter errors while I was here.

BUG=chromium:785997
TEST=cbuildbot/run_tests

Change-Id: Ib8c84aa98ebcb7daf228e50ad7d4b122d827092e
Reviewed-on: https://chromium-review.googlesource.com/826022
Commit-Ready: Jason Clinton <jclinton@chromium.org>
Tested-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: C Shapiro <shapiroc@google.com>
5 files changed