tree 3698dae3205a75a789bd25571404a51c90c631c7
parent 80dbb1d97975def7bf517cacc8db855ad5163dbf
parent fe00ae099cb02fccef274afea6a55245e1d98cd3
author Yifan Hong <elsk@google.com> 1543617521 -0800
committer android-build-merger <android-build-merger@google.com> 1543617521 -0800

Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6af
am: fe00ae099c

Change-Id: I2def1cab9b23061e62c263dd14c5f1061b0d74d8