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

Change-Id: I2d66cc08f94106e2b10296e8eedb37884b13d046