Merge "keymaster: Export HEAP_MASK flag for msm8610 target"