dora, kagura: Update for the android-9.0 maintained branches

Change-Id: Ia2cf2169ec3d950390596db65c5463ccce6ca634
2 files changed