Merge "Scan system_ext while bootstrapping"
am: fcb7b901e7

Change-Id: Iab95405bd1a3d9eb6a544aaa5c340fb2b1bd920a