Fix leftover issues from moving to a folder type bitmask

Bug: 8443606
Change-Id: If269b840604318b8da4342e8c1a5079fb54741ed
3 files changed