Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e
am: ca9c1e0965

Change-Id: Ibd89df485b537f38f21956ed95527d58e8106e9f