Merge "Convert hostsidetests/statsd/apps/statsdapp/Android.mk file to Android.bp (cherrypick)"