tree 514db86712eb6427c1a94cf09517a03e6acd1336
parent dd8aed82c94e2802eea635f7dc68d1eac592e208
parent 8932a17cfb8778f1f97873265da87ad1ee76e4a7
author Ray Essick <essick@google.com> 1569872443 -0700
committer android-build-merger <android-build-merger@google.com> 1569872443 -0700

Merge "Added CMakeLists.txt for x86/x64 build" am: 2f018c0603 am: bb660489b2
am: 8932a17cfb

Change-Id: I3ae46fa3bdcae1cb026641dd96707d4c73c12a41