Merge "Add NDK CPU/GPU headroom APIs" into main