Merge changes from topic "libhardware_vndk" am: 7d03020e96 am: a486d25b96 am: 019636be1e  -s ours
am: ea95461d8a  -s ours

Change-Id: I35a4bcb01d5a7ee29c56a96e3df9e4e6fa954ac7