Merge changes from topic "libvndksupport_cp"
am: c021b75cfd

Change-Id: Ieacf06d5bc67aae7093f8a805bdf47f305a4b08f