Fix multiarch builds

Change-Id: Ib8ef16d4801666da591864ca72b381df34355e95
cryptfs_hw: libcryptfs_hw doesn't go in vendor/lib/hw

Change-Id: I66c09d4ea790c8f2c49f2ff1d31e2cf7300f09a9
Merge branch 'remote' into mkl