Merge "[frameworks][base][statsd] fix -Wreorder-init-list" am: 00ae277630 am: 8208b201ca am: 45129d073e
am: 6425745177

Change-Id: Ia55d8b88ec2970478eb60eae92d8d2755124e4f1