Merge "Build cavp and bssl as both 32 bit and 64 bit." am: ca167a7fa3

Change-Id: I6f70d151d8452a89ab6b912fd9850dfad901a6fe