[automerger skipped] Merge "Add support for order-only dependencies to...
[automerger skipped] Merge "Add support for order-only dependencies to RuleBuilder" into rvc-dev am: 0eb91f4e -s ours
am skip reason: Change-Id Icfa98d6840b1dc2e273ba29c33011635d1cf93b1 with SHA-1 2a2e0db2 is in history
Change-Id: I403c665b5eeab8c231414e5c896d76a600b9dfa4