Commit 81e279b69149ecffdb3e7adff789e9031d5d5683

Brent Cook 2020-03-26T19:01:20

Land #575, fix android build