Merge "hal: enhance vndk fwk detection"