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

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

Change-Id: I66ce5591daf1fe354b2d611b304fa42b9e5373c7