Merge "Switch pattern/PIN constants to match values in cryptfs.h"