Merge "Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS"
am: fce41130cc

Change-Id: Id6a7fe68355d1e672cd00b5657b10db00445be39