Merge branch '2019-10-30-master-imports'
authorTom Rini <trini@konsulko.com>
Fri, 1 Nov 2019 13:23:21 +0000 (09:23 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Nov 2019 13:23:21 +0000 (09:23 -0400)
- Migrate test.py to use python3 and current pytest.
- NVMe bugfixes
- Assorted other fixes
- Android AVB updates.


Trivial merge