[automerger skipped] Merge "Add apex_available to resolver" into rvc-dev am:...
[automerger skipped] Merge "Add apex_available to resolver" into rvc-dev am: 6467a404 am: 96da59e7 am: c5f5003d am: ebb5fd16 -s ours
am skip reason: Change-Id I38d922e07b32d415755c66ddeb97c44aa816e0c2 with SHA-1 3c2b91c9 is in history
Change-Id: I2ba83e01238910da4c17993c69ec85dd6876e278