Merge "Remove intdef usage that block bluetooth apex"