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

Change-Id: I7d97a871042dab43a112f84186f4015b2fe3d6d7