Merge "art_cc_static_library -> art_cc_library_static" am: 6dbf9eca35
am: dd0e15de78

Change-Id: Ia3c755af42f540bbd0df133c8291ca510936c808