Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"