Fix buildbots hidden_api_test am: bfaba28842
am: c881a3310c

Change-Id: I9fe08aa84a53a25cd45a30c1e72471b046fc8999