tree 964bc8396481b29cbd264f5d31ffb1048f9f86f1
parent 6667ab3b4b4b209cf36a51ecb2c98e5e4593f39d
parent 3d00a2875372291f9a7d7ffd80a68d370a1fe3c6
author destradaa <destradaa@google.com> 1512634881 +0000
committer android-build-merger <android-build-merger@google.com> 1512634881 +0000

Updates to allow building in a desktop environment. am: dadb17161e
am: 3d00a28753

Change-Id: I083cb0630df890122f7275a36c9f6dbdfc69e02c