Workaround for fixing compile errors with k3

Change-Id: I5daa4a378e06cf35e5bfd49f6f7bc7627a8e5dcb
Merge branch 'kitkat-k3-testing' of https://github.com/spezi77/platform_bionic into kitkat-k3-testing