Merge "Remove unneeded build files"
am: 28de3b69db

Change-Id: I58cf858410bc63a4211f9121f9616e55f80133aa