Merge "Add replace opt to lpadd make build mixing easier" am: b3ca35e01a am: 10f2902461 am: 24368818bf

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1966334

Change-Id: I21b990eb16d17deb42e801ca194cfdbbdcc04c15