Merge "Remove old prebuilt NDKs." am: cc49ff54e5 am: 03441d9c72
am: 66d4dfb7bc

Change-Id: I9dda98839d3b1fa34d9eb3d884d3c156589ca976