tree 5147aae9bf51ef5be6acc80e32d7a49051c32ea5
parent 0c871647fff2e07e1df90421bb10f5e27c99fdfb
parent f243a3b1057a6c5fb54acbe96f0a7b748249c1bc
author Oli Lan <olilan@google.com> 1575983370 -0800
committer android-build-merger <android-build-merger@google.com> 1575983370 -0800

Merge changes from topics "createapexdirs", "createapexrollbackdirs" am: 3e1c0478b9 am: 0ad91e40ea
am: f243a3b105

Change-Id: I29b4de125231880894571a003791f02c58ce1049