Merge "Merge libsync_recovery rules into libsync."
am: 8fa3adb8a9

Change-Id: I5a37ec60d84c2d92aadc7071f9355fb3ef3bac8c