Merge "Fix initbootimage .PHONY target" am: 4724f77bca

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

Change-Id: Ia217a6f3f185b1ab1113c13b64803b4b6973bf49