Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds."