Merge "tighten up some neverallow rules."
am: dbe5086f25

Change-Id: Iad00113a976d11f0dc61233949cae21ca01b5e96