Merge "Add framework/native to fix build."