4bf5630558
This commit explicitly moves files around without modifying any content so that Git can track them correctly. Change-Id: I087d6d61d4e2d82ce06ad9ac0adf7327db94dd9c