Merge "Fix: statsd path in whilelist of native processes" am: 6bcb5d24e0
am: a14f3d070c

Change-Id: I8514047cf3b7337329f5a08a7267fc5ed5b19b26