Merge "Turn hidden API lists into a single CSV" am: 0edec143d9
am: 7423a90d8c

Change-Id: I059ace8c9d3a6770dc835d776e866790a3db5815