Merge "Re-add compile_multilib to statsd apex"