Merge "Java code for mainline modules to log to statsd." into qt-dev
am: f20d282a6c

Change-Id: I97ac1890fda2262e343acafbbb8822e1de5f6515