Merge "Remove system/fake-libs{,64}/libart.so" am: ddcc8c4860
am: 4956fda7b7

Change-Id: Ia9c3b3afd1cbdd3ab9eef4cd73d6e2776460e37a