Merge "Fix the order for boot scripts scanning" am: ccab04e5b5 am: 28d0dba1f5

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

Change-Id: I740e1af6a5814d682930a7836006c7d55674194f