Merge "Updating RemoveSystemAppPreparer to account for new /system/priv-app directory."