Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am: 5ce7034463 am: e8468634be
am: 44c7467c11

Change-Id: Ifcfd1100edbe52221a9e11a263a6990ecdf87377