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

Change-Id: I957fc825bcc86351f80849eefb3e8a5bca69fbbf