Fix buildbots hidden_api_test am: bfaba28842 am: c881a3310c
am: 236153c9ad

Change-Id: Idd11d38b2b55e6c3afc07f085dfe4ad9429d34ed