tree 9e864db92cd0e788262cd380a0b03ddb9735f235
parent f0d62e8931ab034374d9a0b89abe9065df9928b7
parent 0b722ad6ca382c524423c5e11e9e7e5509070a56
author Lingfeng Yang <lfy@google.com> 1537649932 -0700
committer android-build-merger <android-build-merger@google.com> 1537649932 -0700

Some cleanup in API and data structures am: 44209df8f0 am: 4d8488a497
am: 0b722ad6ca

Change-Id: I618175431c312d54ebbed15c2f7f2d6c62c6dfae