tree 112dbc5ab0f066d24d33447ffc1c2c1cdc837d41
parent 34ec5e19d011adf027c6e023dcc0aa9b57993f1a
parent f02d05e09aaf223aac16eda622f479b0854f281d
author Kelvin Zhang <zhangkelvin@google.com> 1608048996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608048996 +0000

Remove cros specific bits from aosp am: 5c1451f87b am: f02d05e09a

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1512483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e49173bbfa2decfd8652c8da5e24eafdc02b450