Merge "Add statsd_java_aidl to framework-statsd"