Merge branch '2019-07-24-master-imports'
authorTom Rini <trini@konsulko.com>
Wed, 24 Jul 2019 18:15:51 +0000 (14:15 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 24 Jul 2019 18:15:51 +0000 (14:15 -0400)
- Various Android related changes including A/B update and BCB updates
- Assorted minor fixes


Trivial merge