This change removes some android API version ifdefs left over from the
chromeos codebase. These ifdefs are not configured here, so their
presence was causing some necessary code to be omitted.

Bug: 149174783
Test: run e2e tast tests on a minnie, observe height failures are fixed
Change-Id: I666cfd310ae8a53bf5140efae2e3aa065f2d4067
(cherry picked from commit da257b2a288b58220e5226113d661e4f5bc08de0)