Merge changes from topic "libvndksupport_cp" am: c021b75cfd
am: fb47bcc4c8  -s ours

Change-Id: Ia8c0b691087df5a5669d9c1a208100b07b9f14c3