Merge "Fix wrong indent of SystemUI Android.bp"