Merge "Remove external/robolectric/Android.mk"
am: cb407a35be

Change-Id: I8a1369e4f61ffb1bc3497b6e449a6f872a602f6b