Merge changes from topic "libhardware_vndk"
am: 7d03020e96

Change-Id: I13dd1fafc3822d12e9403e467b8b3f803dd990b1