Build rule cleanup

Bug: 122333437
Change-Id: Iabb6dcc4e6615112fdf730f41fe39d34fdac8737
2 files changed