Merge "Disable building coverage with javac"
am: 271b1f6521

Change-Id: Ie65e362bd9736623dec3041891f060cf56b98895