Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Merge "Fix the multi arch issue of resolv_unit_test." am: 0928b2a8 am: 6a0a1fc6 am: 577dee18 am: 2559e11f Change-Id: I8a371bd4a9651d641e66bec61288caa5079c3e66