Merge "Add cgroups.recovery.json into recovery image"
am: e57df508c4

Change-Id: I9a9e4ea7cfc22af97facbd359f2e2a72ec55a19f