Merge "Add com.android.os.statsd to linkerconfig"