Merge "Only run Kati twice on a clean build due to clean_steps.mk" am: 76a75aa72d am: a1df6ed0ee
am: 5cb7217822

Change-Id: I54d440efb9915c7508c9a5e0b3ba33d2e0211a21