Merge "Remove "_host" and "_static" suffix from libsparse." am: 22aabbe13b
am: 7d95329bf0

Change-Id: Ieb969d6353c3ac9f33e65d220f7cb1c67ca3791b