Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c

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

Change-Id: Idbc98804269ec22eeacbedb7524bf45a1aa95c60