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

Change-Id: I4e47239e32acf3a9c870a82ba88bfe8054a1acae