Merge "Add libcompiler_rt-extras from prebuilts/ndk." am: 499490e7e1
am: 14b90de6cd

Change-Id: Ifc1ec6dc54749c4ece71aa7664b227d62f5dabcd