Merge "Override package name for VNDK APEX" am: 405c7ab959 am: c457e7876d

Change-Id: I39b2041e52cab1d465049e727e57b7ae3fbcd6e3