Merge "Remove dependency on frameworks/native"