Merge "Remove obsolete dist rules" am: b7a96816a6

Change-Id: I3b2eca952c12e21ebab5f36ee7b0949dd797e900