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

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

Change-Id: I527dd9fc144b8f601e0ffd62f152845fa3089cb4