[automerger skipped] Merge "Override package name for VNDK APEX" am: 405c7ab959 am: c457e7876d am: c86586dd1d -s ours
am skip reason: Change-Id I623d7a144418d7198f0bbf09c5dc983ed1a631c6 with SHA-1 0ed1b1b169 is in history

Change-Id: Ia6da443fbd49bc290fc5a107441f787929497cf0