Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417

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

Change-Id: Id39b7eab3c5ed08b98aa1766991b08ab7898018e