Merge "Cleaning up comment removal and version replacement" am: 064915259a

Original change: https://android-review.googlesource.com/c/platform/system/apex/+/2151393

Change-Id: I1bcf0ed265e330660d7e2eb02dfc49f455f55720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>