Merge "Fix typo in coverage target out path." am: c6507670f2
am: 1fd609359d

Change-Id: I3650bd75e4b3a8e03f613e430c65f62ef63aaf37