Clean up the build and hopefully fix the support for Screen B.

Change-Id: Ia5e74b80b3fb2750381c95b78b6f8c84f2a3bd4a