Merge "Fix generate_images.py script" into oreo-mr1-cts-dev
am: f1d7319d9d

Change-Id: I2196af8eafe988457fa912375b4fee131aa42782