Merge "Consolidate NDK and APEX implementations"