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

Change-Id: Ie58335b2468cf5838a82d08063ce353054c0b889