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

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

Change-Id: I233056394e6087727a0680f909067512a94509b5