Merge changes from topic "libhardware_vndk" am: 7d03020e96
am: a486d25b96

Change-Id: Id272f77680dc949c35b77111da8b2f2e386d74a1