Merge "[automerger skipped] Don't print :__pkg__ for package rules, since...

Merge "[automerger skipped] Don't print :__pkg__ for package rules, since that's the default. am: 68e9d96d -s ours am: 08ab21a4 -s ours" into rvc-d1-dev-plus-aosp am: 9e79d8d7 -s ours am: ab8f4171 -s ours

am skip reason: Change-Id I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819 with SHA-1 68e9d96d is in history

Change-Id: I3d9b1dd880b3e2de23ffa7c21ecb2ed7d3ba6922