Let's start by fixing the build, then see how possible this will be to do fully. Bug: 110477913 Test: n/a Change-Id: If52e15bd070781a405c5494631ede033c1067903