Merge "Ensure that apis are unhidden even if there is no vdex" am: 20a1e31283 am: 1b9259934e
am: cfd63dd0c0

Change-Id: Ie7a21617084f293e46d25b4a138a31dce8044b7c