Merge "multiproduct_kati: better directory names."
am: a41a5da52a

Change-Id: I332b487bdbce5a52b57d78cd1bc4999824b14d54