Merge "Add android.hardware.ir to vndk"