Merge "Revert "Clear LOCAL_RTTI_FLAG.""