[automerger skipped] Merge "Check for /dev/memcg/system/tasks before writing to it" am: 36ce625ccf  -s ours
am: df01c2cf19  -s ours

Change-Id: I86e73d2e05ba61e24d7ef2a4efcf0e2147a8723f