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

Change-Id: Ic60aca7a2203008f9d21dd457914f14de6a23a7a