tree 08d43abd7ad52882689bd2bc658a47664a70a943
parent e8a435e9290db18f6307520dfbeb452866b1a25f
parent 0ea09ffbe2e0ae63d14130f7c80ac5ed64332b4d
author Tianjie Xu <xunchang@google.com> 1564018761 -0700
committer android-build-merger <android-build-merger@google.com> 1564018761 -0700

Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72 am: 984dc5c263
am: 0ea09ffbe2

Change-Id: If9028f9d44ef9ae2f6da8c029ff6678240bf8dee