Merge "Append whole_static_libs deps from .a files instead of the list of objects." am: 5b79950e99

Change-Id: I41244296f1a790aac195cf614e5687b767519d5d