tree 52c0bc75b26ebbdbe6aa35cb95e8e69de32a76c3
parent b64ec9e960bc1204e6794e0083c2145f1f043abf
author Yifan Hong <elsk@google.com> 1516399112 -0800
committer Yifan Hong <elsk@google.com> 1516402549 +0000

Load ODM manifest from /odm/etc/vintf as well

... as /odm/etc/ . /odm/etc/vintf has higher priority
than files under /odm/etc.

As a side effect, simplified the device manifest loading logic.

Test: vintf_object_test
Fixes: 36790901
Change-Id: Ie4816e83ac88492250b030a5a48b9fd4640c0dbb