Merge "libfs_avb: support key rotation for standalone partitions" am: 33f344cb36
am: 68d33d7f5f

Change-Id: I644b161773fbb10b616830bf0c89d687010dec20