Non-module targets. am: fac5b05a41 am: 0b98b4ff78

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: Iaae3044b72bb7d9b313f62c1e0a67093ef12891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>