Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev am: 38b92986df
am: 39c8fe12e4

Change-Id: Ie27a0d43da9fa0eb0c751cafa3f04220a5f8f18a