Merge "add frameworks/native include paths"