Merge "Remove obsolete dist rules" am: b7a96816a6 am: 5e52eb102b

Change-Id: Ic450460973cb8d31bfaf88828507060a984aefef