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

Change-Id: Id15ee0f45fd974dd422d0574b1389c123b09539f