Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6af
am: fe00ae099c

Change-Id: I2def1cab9b23061e62c263dd14c5f1061b0d74d8