Address comments on shim library changes.

Address comments on aosp/1598153 and aosp/1598155.

Also remove an unused import and fix some javadocs.

Test: treehugger
Change-Id: I2ec0aa737804cc3ea5fce9326f84c1e4b5e4972c
4 files changed