[automerger skipped] Merge "apex: remove compat symlinks to vndk apex" am: 58a7d9c3 am: a898da2f -s ours
am skip reason: Change-Id I852fad7edebed3e4edc03c374b3643da6b053fed with SHA-1 84026389 is in history
Change-Id: Ie469ffde76e202104e57205fa660027ba6c395e3