Merge "init: Convert a single-element array into a scalar" am: ab3bc215 am:...

Merge "init: Convert a single-element array into a scalar" am: ab3bc215 am: f75bd0ee am: c22ec872

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2323101



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