[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: b2bc3e07 am: 0d14bc47 am: c317b470 -s ours
am skip reason: Change-Id I38d922e07b32d415755c66ddeb97c44aa816e0c2 with SHA-1 3c2b91c9 is in history
Change-Id: I16195a08a50f49b3a35d4d8b9abebe977509b872