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

Change-Id: I5a59d1d24185070626e81187e42bce790897da19