Merge "libfs_avb: Pass const string by reference" am: 949a561cfa
am: 0e1a78266b

Change-Id: Ia1702371aa34c4ff36f27d41d4a0f02e121743a0