Merge branch 'stable-3.1'

* stable-3.1:
  Revert "Clean up BUILD rules"

Change-Id: Ia4e306d577100be319f366b202b4e7e1e8f9139d