Merge "Remove unneeded build files" am: 28de3b69db am: 610b861f1d
am: 78bd13a158

Change-Id: I467cfeb60229ec8bbf2f26d2f396e01283de98f8