Merge "Add builtins and minimal runtime as dependencies instead of flags" am: 251d6500db am: 64ef5e9968

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980448

Change-Id: I8ea95bf8b1fa1360801bcff3df071d44ce117630