Merge "Restorecon: save digest of all partial matches for directory" am: f797b5b327
am: 63b151c687

Change-Id: I96c75bb29480054ebd98dc65499b5806f224bb0a