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

Change-Id: I466988d007adbbc68b43687c9eb0c1e6a3e4ae1e