Merge common LESS files properly

Change-Id: Id8d6a2394130ca6a92c4cef59369e2d8e445450b