Add even more build debugging am: f0028fd7e2
am: c20205bcc0

Change-Id: I6d022f6f894b9d4a00215e33864f0d58129c76b3