Merge "Reorganize ahat source directory layout."
am: 930e332a1f

Change-Id: I3d0bfc39f0b56a1abf51374cd430d04320386ae2