Merge "Make per-application memcg hierarchy configurable via a property" into pi-dev
am: f6f8751fd6

Change-Id: Ia53a3e6905ba8aad82980860ebbd6c981ab82a1c