[Berberis] Code clean up

Fixes some presubmit failures.

Bug: 311206726
Test: Test against sdk_gphone64_x86_64 and start the adobe reader app
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d707b481a4c2dbf89e71c46d026775ebefe85ca9)
Merged-In: Ibd4802e6ee125131eb3b8be01950b6661601a21e
Change-Id: Ibd4802e6ee125131eb3b8be01950b6661601a21e
2 files changed