tree 33c3f7273b10785128ffa971ba6388866dca3e07
parent 13b4c03aed77f76bd013bca5919539693320430a
parent c7a313123b3dcb845ed3822b99ad9db69a6a82c8
author Dan Willemsen <dwillemsen@google.com> 1547152419 -0800
committer Dan Willemsen <dwillemsen@google.com> 1547152675 -0800

Merge branch 'aosp/upstream-master' into master

Add the necessary android third-party files.

Remove the git submodule, as those are unsupported in Android trees.

Bug: 122270019
Test: None